Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hazy Food Tweaks Patch #661

Merged
merged 16 commits into from
Nov 8, 2024

Conversation

HazelHyena
Copy link
Contributor

@HazelHyena HazelHyena commented Nov 6, 2024

Description

A quick update to food tweaks, fixing things on the backend for mappers and removing duplicate Meme Garbage.

Changelog

🆑

  • removed: Every SS14 meme recipe that didn't fit N14 (the bearger persists, for example)
  • added: flour bags contain razorgrain flour and cornmeal bags contain maize flour. This has been tweaked to prevent conflicts with SS14 recipes upstream - all N14 dough recipes SHOULD require these ingredients in place of the upstream reagents. (this should allow pizzas to work)
  • Changed the naming structure for all recipes to make spawning things easier for admins and mappers.
  • removed: a few recipes were throwing up errors and not working. They're out for now.
  • We have N14 egg cartons now which contain N14 eggs. Until chickens are properly sorted out, this will allow recipe usage in the interim!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oops this was the upstream one. I'll fix that now

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also getting rid of this, pep fixed this (why did it add this text from earlier? bleh)

@HazelHyena
Copy link
Contributor Author

Don't merge this just yet, please! Give me a shout on discord, I need getting rid of robust toolbox clientside bugs so I can test the pizza recipes :)

@Peptide90 Peptide90 merged commit 88db9a0 into Vault-Overseers:master Nov 8, 2024
8 checks passed
Partmedia added a commit that referenced this pull request Nov 8, 2024
@Partmedia
Copy link
Contributor

I'm reverting this PR because this causes the Sunnyvale map to fail to load. Please feel free to re-PR after you've taken a look at the issue and fixed it.

Peptide90 pushed a commit that referenced this pull request Nov 11, 2024
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

Added in showers. A pure RP furniture item.

---

# TODO

<!--
A list of everything you have to do before this PR is "complete"
You probably won't have to complete everything before merging but it's
good to leave future references
-->

- [x] Sound effects
- [x] Wallmount
- [x] Add in Showers

---



![Display](https://github.com/user-attachments/assets/c8499c33-a9ce-4d2d-9003-ed8517afb0b9)


---

# Changelog

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl: Tilkku
- add: Added showers
Peptide90 pushed a commit that referenced this pull request Nov 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants